Skip to content

Порт рыбалки#116

Merged
Shegare merged 8 commits intomasterfrom
Fishing
Feb 17, 2026
Merged

Порт рыбалки#116
Shegare merged 8 commits intomasterfrom
Fishing

Conversation

@Shegare
Copy link
Owner

@Shegare Shegare commented Feb 14, 2026

Описание PR

Порт рыбалки с Губ стейшн

Почему / Баланс

Порт, рыбалка

Технические детали

N/A

Медиа

N/A

Требования

  • Я добавил медиафайлы (скрины, видео) к этому PR или он не требует демонстрации в игре.
  • Я проверил что мои изменения не вызывают конфликтов и багов в сборке.
  • Я уверен, что мои изменения не нарушают лицензионные соглашения.

TODO

  • Правильные лицензии
  • Перевести ентити
  • Проверить что не намусорил в папках оффов / правильные комменты в файлах оффов

Список изменений

🆑 @Shegare

  • 🆕 Порт: Добавлена рыбалка.

@github-actions
Copy link
Contributor

github-actions bot commented Feb 14, 2026

RSI Diff Bot; head commit 712a43b merging into b8f1ff8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Goobstation/Interface/Misc/fish_bar.rsi

State Old New Status
icon Added

Resources/Textures/_Goobstation/Objects/Specific/Fishing/fish.rsi

State Old New Status
alien Added
angler Added
bass Added
bingle Added
blob Added
blue_fintuna Added
boy_fisher Added
catfish Added
clown Added
disk Added
gib Added
ian Added
mutant Added
nuker Added
pufferfish Added
silverfish Added
sun_tropical Added
toxic Added
tropical Added

Resources/Textures/_Goobstation/Objects/Specific/Fishing/fishing_lure.rsi

State Old New Status
icon Added
rope Added

Resources/Textures/_Goobstation/Objects/Specific/Fishing/fishing_rod.rsi

State Old New Status
icon-active Added
icon Added
inhand-left-active Added
inhand-left Added
inhand-right-active Added
inhand-right Added

Resources/Textures/_Goobstation/Objects/Specific/Fishing/fishing_spot.rsi

State Old New Status
water Added

Resources/Textures/_Goobstation/Objects/Specific/Fishing/golden_rod.rsi

State Old New Status
icon-active Added
icon Added
inhand-left-active Added
inhand-left Added
inhand-right-active Added
inhand-right Added

Resources/Textures/_Goobstation/Objects/Specific/Fishing/goon_rod.rsi

State Old New Status
icon-active Added
icon Added
inhand-left-active Added
inhand-left Added
inhand-right-active Added
inhand-right Added

Resources/Textures/_Goobstation/Objects/Specific/Fishing/makeshift_lure.rsi

State Old New Status
icon Added
rope Added

Resources/Textures/_Goobstation/Objects/Specific/Fishing/makeshift_rod.rsi

State Old New Status
icon-active Added
icon Added
inhand-left-active Added
inhand-left Added
inhand-right-active Added
inhand-right Added

Edit: diff updated after 712a43b

@Shegare Shegare merged commit 08aaeb9 into master Feb 17, 2026
14 checks passed
@Shegare Shegare deleted the Fishing branch February 17, 2026 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant